From: Carlos Garnacho <carlosg@gnome.org>
Date: Mon, 13 Feb 2017 10:55:24 +0000 (+0100)
Subject: padOsd: peek pads attached to the same tablet
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~446
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ada21c975f1087910fc3c9a0f7e1afecb5976a56;p=gnome-shell.git

padOsd: peek pads attached to the same tablet

https://bugzilla.gnome.org/show_bug.cgi?id=779986
---

diff --git a/js/ui/padOsd.js b/js/ui/padOsd.js
index e43b9a04f..e172a6e4f 100644
--- a/js/ui/padOsd.js
+++ b/js/ui/padOsd.js
@@ -528,6 +528,7 @@ const PadOsd = new Lang.Class({
 
     _init: function (padDevice, settings, imagePath, editionMode, monitorIndex) {
         this.padDevice = padDevice;
+        this._groupPads = [ padDevice ];
         this._settings = settings;
         this._imagePath = imagePath;
         this._editionMode = editionMode;
@@ -540,6 +541,13 @@ const PadOsd = new Lang.Class({
                 this.destroy();
         }));
 
+        deviceManager.list_devices().forEach(Lang.bind(this, function(device) {
+            if (device != this.padDevice &&
+                device.get_device_type() == Clutter.InputDeviceType.PAD_DEVICE &&
+                this.padDevice.is_grouped(device))
+                this._groupPads.push(device);
+        }));
+
         this.actor = new St.BoxLayout({ style_class: 'pad-osd-window',
                                         x_expand: true,
                                         y_expand: true,